diff --git a/.cirrus.yml b/.cirrus.yml
index e60981cbabf5e27c765d0c22a4881fa850e4d398..caabe833e1d026ba62e6c037ea0807a8ef314578 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,9 +1,10 @@
 freebsd_instance:
-  image: freebsd-12-0-release-amd64
+  image: freebsd-12-1-release-amd64
 
 task:
-  install_script: pkg install -y
+  install_script: ASSUME_ALWAYS_YES=yes pkg bootstrap -f;
+    pkg install -y
     autoconf bash binutils coreutils e2fsprogs-libuuid
     git gmake libunwind ncurses pkgconf hs-pandoc
 
-  script: CFLAGS="-Wno-unused-value" gmake
+  script: CFLAGS="-Wno-unused-value" gmake
\ No newline at end of file
diff --git a/src/test/scope/out0.log.match b/src/test/scope/out0.log.match
index 0bab485d22e12700a8fd250b38c875443a92aed7..a567a41f053644237c5a3f1badd5041ead28913e 100644
--- a/src/test/scope/out0.log.match
+++ b/src/test/scope/out0.log.match
@@ -1,17 +1,17 @@
 $(*)
-vmem_aligned_alloc
-vmem_calloc
-vmem_check
-vmem_check_version
-vmem_create
-vmem_create_in_region
-vmem_delete
-vmem_errormsg
-vmem_free
-vmem_malloc
-vmem_malloc_usable_size
-vmem_realloc
-vmem_set_funcs
-vmem_stats_print
-vmem_strdup
-vmem_wcsdup
+vmem_aligned_alloc$(nW)
+vmem_calloc$(nW)
+vmem_check$(nW)
+vmem_check_version$(nW)
+vmem_create$(nW)
+vmem_create_in_region$(nW)
+vmem_delete$(nW)
+vmem_errormsg$(nW)
+vmem_free$(nW)
+vmem_malloc$(nW)
+vmem_malloc_usable_size$(nW)
+vmem_realloc$(nW)
+vmem_set_funcs$(nW)
+vmem_stats_print$(nW)
+vmem_strdup$(nW)
+vmem_wcsdup$(nW)
diff --git a/src/test/scope/out1.log.match b/src/test/scope/out1.log.match
index 147bb35206b3e10b52ec0858f3a7af7aa85a7f63..3e5064c42915d2387e9dfa8dd0cb3c020d2a831d 100644
--- a/src/test/scope/out1.log.match
+++ b/src/test/scope/out1.log.match
@@ -1,26 +1,26 @@
 $(*)
-pmem_check_version
-pmem_deep_drain
-pmem_deep_flush
-pmem_deep_persist
-pmem_drain
-pmem_errormsg
-$(OPT)pmem_fault_injection_enabled
-pmem_flush
-pmem_has_auto_flush
-pmem_has_hw_drain
-$(OPT)pmem_inject_fault_at
-pmem_is_pmem
-pmem_map_file
-pmem_memcpy
-pmem_memcpy_nodrain
-pmem_memcpy_persist
-pmem_memmove
-pmem_memmove_nodrain
-pmem_memmove_persist
-pmem_memset
-pmem_memset_nodrain
-pmem_memset_persist
-pmem_msync
-pmem_persist
-pmem_unmap
+pmem_check_version$(nW)
+pmem_deep_drain$(nW)
+pmem_deep_flush$(nW)
+pmem_deep_persist$(nW)
+pmem_drain$(nW)
+pmem_errormsg$(nW)
+$(OPT)pmem_fault_injection_enabled$(nW)
+pmem_flush$(nW)
+pmem_has_auto_flush$(nW)
+pmem_has_hw_drain$(nW)
+$(OPT)pmem_inject_fault_at$(nW)
+pmem_is_pmem$(nW)
+pmem_map_file$(nW)
+pmem_memcpy$(nW)
+pmem_memcpy_nodrain$(nW)
+pmem_memcpy_persist$(nW)
+pmem_memmove$(nW)
+pmem_memmove_nodrain$(nW)
+pmem_memmove_persist$(nW)
+pmem_memset$(nW)
+pmem_memset_nodrain$(nW)
+pmem_memset_persist$(nW)
+pmem_msync$(nW)
+pmem_persist$(nW)
+pmem_unmap$(nW)
diff --git a/src/test/scope/out2.log.match b/src/test/scope/out2.log.match
index 23d50cb51391a4503b19e37f2b5687f96a0100da..50cdea8f67547d64ee32bcc81a841fd6352aa059 100644
--- a/src/test/scope/out2.log.match
+++ b/src/test/scope/out2.log.match
@@ -1,19 +1,19 @@
 $(*)
-pmemlog_append
-pmemlog_appendv
-pmemlog_check
-pmemlog_check_version
-pmemlog_close
-pmemlog_create
-pmemlog_ctl_exec
-pmemlog_ctl_get
-pmemlog_ctl_set
-pmemlog_errormsg
-$(OPT)pmemlog_fault_injection_enabled
-$(OPT)pmemlog_inject_fault_at
-pmemlog_nbyte
-pmemlog_open
-pmemlog_rewind
-pmemlog_set_funcs
-pmemlog_tell
-pmemlog_walk
+pmemlog_append$(nW)
+pmemlog_appendv$(nW)
+pmemlog_check$(nW)
+pmemlog_check_version$(nW)
+pmemlog_close$(nW)
+pmemlog_create$(nW)
+pmemlog_ctl_exec$(nW)
+pmemlog_ctl_get$(nW)
+pmemlog_ctl_set$(nW)
+pmemlog_errormsg$(nW)
+$(OPT)pmemlog_fault_injection_enabled$(nW)
+$(OPT)pmemlog_inject_fault_at$(nW)
+pmemlog_nbyte$(nW)
+pmemlog_open$(nW)
+pmemlog_rewind$(nW)
+pmemlog_set_funcs$(nW)
+pmemlog_tell$(nW)
+pmemlog_walk$(nW)
diff --git a/src/test/scope/out3.log.match b/src/test/scope/out3.log.match
index 06b81cf28591a87e3c397af06b34a0f1b9a0fc8e..f6267565169ee2cb7d3300bef853625eac25f802 100644
--- a/src/test/scope/out3.log.match
+++ b/src/test/scope/out3.log.match
@@ -1,19 +1,19 @@
 $(*)
-pmemblk_bsize
-pmemblk_check
-pmemblk_check_version
-pmemblk_close
-pmemblk_create
-pmemblk_ctl_exec
-pmemblk_ctl_get
-pmemblk_ctl_set
-pmemblk_errormsg
-$(OPT)pmemblk_fault_injection_enabled
-$(OPT)pmemblk_inject_fault_at
-pmemblk_nblock
-pmemblk_open
-pmemblk_read
-pmemblk_set_error
-pmemblk_set_funcs
-pmemblk_set_zero
-pmemblk_write
+pmemblk_bsize$(nW)
+pmemblk_check$(nW)
+pmemblk_check_version$(nW)
+pmemblk_close$(nW)
+pmemblk_create$(nW)
+pmemblk_ctl_exec$(nW)
+pmemblk_ctl_get$(nW)
+pmemblk_ctl_set$(nW)
+pmemblk_errormsg$(nW)
+$(OPT)pmemblk_fault_injection_enabled$(nW)
+$(OPT)pmemblk_inject_fault_at$(nW)
+pmemblk_nblock$(nW)
+pmemblk_open$(nW)
+pmemblk_read$(nW)
+pmemblk_set_error$(nW)
+pmemblk_set_funcs$(nW)
+pmemblk_set_zero$(nW)
+pmemblk_write$(nW)
diff --git a/src/test/scope/out4.log.match b/src/test/scope/out4.log.match
index 88e8bbc0c9f90426ece16263b82de76bb3832b15..d28db4ba7381ec670e116ba46dc51bebe06538ca 100644
--- a/src/test/scope/out4.log.match
+++ b/src/test/scope/out4.log.match
@@ -1,95 +1,95 @@
 $(*)
-_pobj_cache_invalidate
-_pobj_cached_pool
-_pobj_debug_notice
-pmemobj_alloc
-pmemobj_alloc_usable_size
-pmemobj_cancel
-pmemobj_check
-pmemobj_check_version
-pmemobj_close
-pmemobj_cond_broadcast
-pmemobj_cond_signal
-pmemobj_cond_timedwait
-pmemobj_cond_wait
-pmemobj_cond_zero
-pmemobj_create
-pmemobj_ctl_exec
-pmemobj_ctl_get
-pmemobj_ctl_set
-pmemobj_defer_free
-pmemobj_direct
-pmemobj_drain
-pmemobj_errormsg
-$(OPT)pmemobj_fault_injection_enabled
-pmemobj_first
-pmemobj_flush
-pmemobj_free
-$(OPT)pmemobj_inject_fault_at
-pmemobj_list_insert
-pmemobj_list_insert_new
-pmemobj_list_move
-pmemobj_list_remove
-pmemobj_memcpy
-pmemobj_memcpy_persist
-pmemobj_memmove
-pmemobj_memset
-pmemobj_memset_persist
-pmemobj_mutex_lock
-pmemobj_mutex_timedlock
-pmemobj_mutex_trylock
-pmemobj_mutex_unlock
-pmemobj_mutex_zero
-pmemobj_next
-pmemobj_oid
-pmemobj_open
-pmemobj_persist
-pmemobj_pool_by_oid
-pmemobj_pool_by_ptr
-pmemobj_publish
-pmemobj_realloc
-pmemobj_reserve
-pmemobj_root
-pmemobj_root_construct
-pmemobj_root_size
-pmemobj_rwlock_rdlock
-pmemobj_rwlock_timedrdlock
-pmemobj_rwlock_timedwrlock
-pmemobj_rwlock_tryrdlock
-pmemobj_rwlock_trywrlock
-pmemobj_rwlock_unlock
-pmemobj_rwlock_wrlock
-pmemobj_rwlock_zero
-pmemobj_set_funcs
-pmemobj_set_value
-pmemobj_strdup
-pmemobj_tx_abort
-pmemobj_tx_add_range
-pmemobj_tx_add_range_direct
-pmemobj_tx_alloc
-pmemobj_tx_begin
-pmemobj_tx_commit
-pmemobj_tx_end
-pmemobj_tx_errno
-pmemobj_tx_free
-pmemobj_tx_lock
-pmemobj_tx_process
-pmemobj_tx_publish
-pmemobj_tx_realloc
-pmemobj_tx_stage
-pmemobj_tx_strdup
-pmemobj_tx_wcsdup
-pmemobj_tx_xadd_range
-pmemobj_tx_xadd_range_direct
-pmemobj_tx_xalloc
-pmemobj_tx_zalloc
-pmemobj_tx_zrealloc
-pmemobj_type_num
-pmemobj_volatile
-pmemobj_wcsdup
-pmemobj_xalloc
-pmemobj_xflush
-pmemobj_xpersist
-pmemobj_xreserve
-pmemobj_zalloc
-pmemobj_zrealloc
+_pobj_cache_invalidate$(nW)
+_pobj_cached_pool$(nW)
+_pobj_debug_notice$(nW)
+pmemobj_alloc$(nW)
+pmemobj_alloc_usable_size$(nW)
+pmemobj_cancel$(nW)
+pmemobj_check$(nW)
+pmemobj_check_version$(nW)
+pmemobj_close$(nW)
+pmemobj_cond_broadcast$(nW)
+pmemobj_cond_signal$(nW)
+pmemobj_cond_timedwait$(nW)
+pmemobj_cond_wait$(nW)
+pmemobj_cond_zero$(nW)
+pmemobj_create$(nW)
+pmemobj_ctl_exec$(nW)
+pmemobj_ctl_get$(nW)
+pmemobj_ctl_set$(nW)
+pmemobj_defer_free$(nW)
+pmemobj_direct$(nW)
+pmemobj_drain$(nW)
+pmemobj_errormsg$(nW)
+$(OPT)pmemobj_fault_injection_enabled$(nW)
+pmemobj_first$(nW)
+pmemobj_flush$(nW)
+pmemobj_free$(nW)
+$(OPT)pmemobj_inject_fault_at$(nW)
+pmemobj_list_insert$(nW)
+pmemobj_list_insert_new$(nW)
+pmemobj_list_move$(nW)
+pmemobj_list_remove$(nW)
+pmemobj_memcpy$(nW)
+pmemobj_memcpy_persist$(nW)
+pmemobj_memmove$(nW)
+pmemobj_memset$(nW)
+pmemobj_memset_persist$(nW)
+pmemobj_mutex_lock$(nW)
+pmemobj_mutex_timedlock$(nW)
+pmemobj_mutex_trylock$(nW)
+pmemobj_mutex_unlock$(nW)
+pmemobj_mutex_zero$(nW)
+pmemobj_next$(nW)
+pmemobj_oid$(nW)
+pmemobj_open$(nW)
+pmemobj_persist$(nW)
+pmemobj_pool_by_oid$(nW)
+pmemobj_pool_by_ptr$(nW)
+pmemobj_publish$(nW)
+pmemobj_realloc$(nW)
+pmemobj_reserve$(nW)
+pmemobj_root$(nW)
+pmemobj_root_construct$(nW)
+pmemobj_root_size$(nW)
+pmemobj_rwlock_rdlock$(nW)
+pmemobj_rwlock_timedrdlock$(nW)
+pmemobj_rwlock_timedwrlock$(nW)
+pmemobj_rwlock_tryrdlock$(nW)
+pmemobj_rwlock_trywrlock$(nW)
+pmemobj_rwlock_unlock$(nW)
+pmemobj_rwlock_wrlock$(nW)
+pmemobj_rwlock_zero$(nW)
+pmemobj_set_funcs$(nW)
+pmemobj_set_value$(nW)
+pmemobj_strdup$(nW)
+pmemobj_tx_abort$(nW)
+pmemobj_tx_add_range$(nW)
+pmemobj_tx_add_range_direct$(nW)
+pmemobj_tx_alloc$(nW)
+pmemobj_tx_begin$(nW)
+pmemobj_tx_commit$(nW)
+pmemobj_tx_end$(nW)
+pmemobj_tx_errno$(nW)
+pmemobj_tx_free$(nW)
+pmemobj_tx_lock$(nW)
+pmemobj_tx_process$(nW)
+pmemobj_tx_publish$(nW)
+pmemobj_tx_realloc$(nW)
+pmemobj_tx_stage$(nW)
+pmemobj_tx_strdup$(nW)
+pmemobj_tx_wcsdup$(nW)
+pmemobj_tx_xadd_range$(nW)
+pmemobj_tx_xadd_range_direct$(nW)
+pmemobj_tx_xalloc$(nW)
+pmemobj_tx_zalloc$(nW)
+pmemobj_tx_zrealloc$(nW)
+pmemobj_type_num$(nW)
+pmemobj_volatile$(nW)
+pmemobj_wcsdup$(nW)
+pmemobj_xalloc$(nW)
+pmemobj_xflush$(nW)
+pmemobj_xpersist$(nW)
+pmemobj_xreserve$(nW)
+pmemobj_zalloc$(nW)
+pmemobj_zrealloc$(nW)
diff --git a/src/test/scope/out6.log.match b/src/test/scope/out6.log.match
index c643159d593c257022e1583bf5cd626295f107e7..5a3855b899ab76fb2e9566c3c400aeeb8a7a7b63 100644
--- a/src/test/scope/out6.log.match
+++ b/src/test/scope/out6.log.match
@@ -1,14 +1,14 @@
 $(*)
-pmempool_check
-pmempool_check_end
-pmempool_check_init
-pmempool_check_version
-pmempool_errormsg
-$(OPT)pmempool_fault_injection_enabled
-pmempool_feature_disable
-pmempool_feature_enable
-pmempool_feature_query
-$(OPT)pmempool_inject_fault_at
-pmempool_rm
-pmempool_sync
-pmempool_transform
+pmempool_check$(nW)
+pmempool_check_end$(nW)
+pmempool_check_init$(nW)
+pmempool_check_version$(nW)
+pmempool_errormsg$(nW)
+$(OPT)pmempool_fault_injection_enabled$(nW)
+pmempool_feature_disable$(nW)
+pmempool_feature_enable$(nW)
+pmempool_feature_query$(nW)
+$(OPT)pmempool_inject_fault_at$(nW)
+pmempool_rm$(nW)
+pmempool_sync$(nW)
+pmempool_transform$(nW)