diff --git a/selftest/conf/resources.conf b/selftest/conf/resources.conf
index b186737..9e4e015 100644
--- a/selftest/conf/resources.conf
+++ b/selftest/conf/resources.conf
@@ -13,6 +13,7 @@
   ipa_unit_id: 1
   addr: 10.42.42.114
   band: GSM-1800
+  direct_pcu: true
   ciphers:
   - 'a5_0'
   - 'a5_1'
diff --git a/selftest/resource_test.ok b/selftest/resource_test.ok
index 09c276a..650a8bc 100644
--- a/selftest/resource_test.ok
+++ b/selftest/resource_test.ok
@@ -46,10 +46,11 @@
            {'_hash': 'dc9ce027a257da087f31a5bc1ee6b4abd2637369',
             'arfcn': '548',
             'band': 'GSM-1900'}],
- 'bts': [{'_hash': '377ac78d5404b826d40c84efd04b4a9fd4e62b7e',
+ 'bts': [{'_hash': 'd2aa7c1124943de352351b650ca0c751784da6b6',
           'addr': '10.42.42.114',
           'band': 'GSM-1800',
           'ciphers': ['a5_0', 'a5_1'],
+          'direct_pcu': 'True',
           'ipa_unit_id': '1',
           'label': 'sysmoBTS 1002',
           'type': 'osmo-bts-sysmo'},
@@ -118,12 +119,13 @@
   arfcn: '514'
   band: GSM-1800
 --- testowner: Reserving 2 x bts (candidates: 3)
---- testowner: DBG: Picked - _hash: 377ac78d5404b826d40c84efd04b4a9fd4e62b7e
+--- testowner: DBG: Picked - _hash: d2aa7c1124943de352351b650ca0c751784da6b6
   addr: 10.42.42.114
   band: GSM-1800
   ciphers:
   - a5_0
   - a5_1
+  direct_pcu: 'True'
   ipa_unit_id: '1'
   label: sysmoBTS 1002
   type: osmo-bts-sysmo
@@ -170,13 +172,14 @@
   arfcn: '514'
   band: GSM-1800
 bts:
-- _hash: 377ac78d5404b826d40c84efd04b4a9fd4e62b7e
+- _hash: d2aa7c1124943de352351b650ca0c751784da6b6
   _reserved_by: testowner-123-1490837279
   addr: 10.42.42.114
   band: GSM-1800
   ciphers:
   - a5_0
   - a5_1
+  direct_pcu: 'True'
   ipa_unit_id: '1'
   label: sysmoBTS 1002
   type: osmo-bts-sysmo
diff --git a/selftest/template_test.ok b/selftest/template_test.ok
index dcfacc2..bae21d2 100644
--- a/selftest/template_test.ok
+++ b/selftest/template_test.ok
@@ -50,7 +50,34 @@
   rach max transmission 7
   ip.access unit_id val_bts.unit_id_bts0 0
   oml ip.access stream_id val_bts.stream_id_bts0 line 0
-  gprs mode none
+  gprs mode gprs
+  gprs routing area 0
+  gprs network-control-order nc1
+  gprs cell bvci 1800
+  gprs cell timer blocking-timer 3
+  gprs cell timer blocking-retries 3
+  gprs cell timer unblocking-retries 3
+  gprs cell timer reset-timer 3
+  gprs cell timer reset-retries 3
+  gprs cell timer suspend-timer 10
+  gprs cell timer suspend-retries 3
+  gprs cell timer resume-timer 10
+  gprs cell timer resume-retries 3
+  gprs cell timer capability-update-timer 10
+  gprs cell timer capability-update-retries 3
+  gprs nsei 1800
+  gprs ns timer tns-block 3
+  gprs ns timer tns-block-retries 3
+  gprs ns timer tns-reset 3
+  gprs ns timer tns-reset-retries 3
+  gprs ns timer tns-test 30
+  gprs ns timer tns-alive 3
+  gprs ns timer tns-alive-retries 10
+  gprs nsvc 0 nsvci 1800
+  gprs nsvc 0 local udp port 23020
+  gprs nsvc 0 remote udp port 23000
+  gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts0
+  no force-combined-si
   trx 0
    rf_locked 0
    arfcn val_trx_arfcn_trx0
@@ -94,7 +121,34 @@
   rach max transmission 7
   ip.access unit_id val_bts.unit_id_bts1 0
   oml ip.access stream_id val_bts.stream_id_bts1 line 0
-  gprs mode none
+  gprs mode gprs
+  gprs routing area 0
+  gprs network-control-order nc1
+  gprs cell bvci 1800
+  gprs cell timer blocking-timer 3
+  gprs cell timer blocking-retries 3
+  gprs cell timer unblocking-retries 3
+  gprs cell timer reset-timer 3
+  gprs cell timer reset-retries 3
+  gprs cell timer suspend-timer 10
+  gprs cell timer suspend-retries 3
+  gprs cell timer resume-timer 10
+  gprs cell timer resume-retries 3
+  gprs cell timer capability-update-timer 10
+  gprs cell timer capability-update-retries 3
+  gprs nsei 1800
+  gprs ns timer tns-block 3
+  gprs ns timer tns-block-retries 3
+  gprs ns timer tns-reset 3
+  gprs ns timer tns-reset-retries 3
+  gprs ns timer tns-test 30
+  gprs ns timer tns-alive 3
+  gprs ns timer tns-alive-retries 10
+  gprs nsvc 0 nsvci 1800
+  gprs nsvc 0 local udp port 23020
+  gprs nsvc 0 remote udp port 23000
+  gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts1
+  no force-combined-si
   trx 0
    rf_locked 0
    arfcn val_trx_arfcn_trx0
diff --git a/selftest/template_test.py b/selftest/template_test.py
index 0c83632..314dd8d 100755
--- a/selftest/template_test.py
+++ b/selftest/template_test.py
@@ -26,6 +26,7 @@
     'base_station_id_code': 'val_bts.base_station_id_code',
     'ipa_unit_id': 'val_bts.unit_id',
     'stream_id': 'val_bts.stream_id',
+    'sgsn': (dict(ip_address=dict(addr='val_bts.sgsn_ip_addr'))),
     'trx_list': (
             dict(arfcn='val_trx_arfcn_trx0',
                 nominal_power='val_trx_nominal_power_trx0',