diff --git a/src/pg/test/expected/41_observatory_augmentation_test.out b/src/pg/test/expected/41_observatory_augmentation_test.out
index 23ef1ec..3a00d0d 100644
--- a/src/pg/test/expected/41_observatory_augmentation_test.out
+++ b/src/pg/test/expected/41_observatory_augmentation_test.out
@@ -1,170 +1,72 @@
-\i test/sql/load_fixtures.sql
+\i test/fixtures/load_fixtures.sql
 SET client_min_messages TO WARNING;
-\set ECHO none
-Loading obs_table.sql fixture file...
-Done.
-Loading obs_column.sql fixture file...
-Done.
-Loading obs_column_table.sql fixture file...
-Done.
-Loading obs_column_to_column.sql fixture file...
-Done.
-Loading obs_column_tag.sql fixture file...
-Done.
-Loading obs_tag.sql fixture file...
-Done.
-Loading obs_85328201013baa14e8e8a4a57a01e6f6fbc5f9b1.sql fixture file...
-Done.
-Loading obs_3e7cc9cfd403b912c57b42d5f9195af9ce2f3cdb.sql fixture file...
-Done.
-Loading obs_ab038198aaab3f3cb055758638ee4de28ad70146.sql fixture file...
-Done.
-Loading obs_a92e1111ad3177676471d66bb8036e6d057f271b.sql fixture file...
-Done.
-Loading obs_11ee8b82c877c073438bc935a91d3dfccef875d1.sql fixture file...
-Done.
-Loading obs_d34555209878e8c4b37cf0b2b3d072ff129ec470.sql fixture file...
-Done.
-Loading obs_b0ef6dd68d5faddbf231fd7f02916b3d00ec43c4.sql fixture file...
-Done.
- obs_getdemographicsnapshot_test_no_returns 
---------------------------------------------
- t
+\set ECHO all
+obs_getdemographicsnapshot_test_no_returns
+t
 (1 row)
-
- obs_get_gini_index_at_test_point 
-----------------------------------
- t
+obs_get_gini_index_at_test_point
+t
 (1 row)
-
- obs_get_gini_index_at_null_island 
------------------------------------
- t
+obs_get_gini_index_at_null_island
+t
 (1 row)
-
- obs_getpoints_for_test_point 
-------------------------------
- t
+obs_getpoints_for_test_point
+t
 (1 row)
-
- obs_getpoints_for_null_island 
--------------------------------
- t
+obs_getpoints_for_null_island
+t
 (1 row)
-
- obs_getpolygons_for_test_point 
---------------------------------
- t
+obs_getpolygons_for_test_point
+t
 (1 row)
-
- obs_getpolygons_for_null_island 
----------------------------------
- t
+obs_getpolygons_for_null_island
+t
 (1 row)
-
- test_point_segmentation 
--------------------------
- t
+test_point_segmentation
+t
 (1 row)
-
- null_island_segmentation 
---------------------------
- t
+null_island_segmentation
+t
 (1 row)
-
- getcategories_at_test_point_1 | getcategories_at_test_point_2 
--------------------------------+-------------------------------
- t                             | t
+getcategories_at_test_point_1|getcategories_at_test_point_2
+t|t
 (1 row)
-
- getcategories_at_null_island 
-------------------------------
- t
+getcategories_at_null_island
+t
 (1 row)
-
-  obs_getmeasure  
-------------------
- 9516.27915900609
+obs_getmeasure
+9516.27915900609
 (1 row)
-
- obs_getmeasure 
-----------------
-           1655
+obs_getmeasure
+1655
 (1 row)
-
-     obs_getmeasure     
-------------------------
- 0.64652567975830779836
+obs_getmeasure
+0.64652567975830779836
 (1 row)
-
-     obs_getmeasure     
-------------------------
- 0.64652567975830815710
+obs_getmeasure
+0.64652567975830815710
 (1 row)
-
-       obs_getcategory       
------------------------------
- Wealthy, urban without Kids
+obs_getcategory
+Wealthy, urban without Kids
 (1 row)
-
-        obs_getcategory        
--------------------------------
- Low income, mix of minorities
+obs_getcategory
+Low income, mix of minorities
 (1 row)
-
- obs_getpopulation 
--------------------
-  9516.27915900609
+obs_getpopulation
+9516.27915900609
 (1 row)
-
- obs_getpopulation 
--------------------
-              1655
+obs_getpopulation
+1655
 (1 row)
-
- obs_getuscensusmeasure 
-------------------------
-       6152.51885204623
+obs_getuscensusmeasure
+6152.51885204623
 (1 row)
-
- obs_getuscensusmeasure 
-------------------------
-                   1070
+obs_getuscensusmeasure
+1070
 (1 row)
-
-   obs_getuscensuscategory   
------------------------------
- Wealthy, urban without Kids
+obs_getuscensuscategory
+Wealthy, urban without Kids
 (1 row)
-
-    obs_getuscensuscategory    
--------------------------------
- Low income, mix of minorities
+obs_getuscensuscategory
+Low income, mix of minorities
 (1 row)
-
-Dropping obs_table.sql fixture table...
-Done.
-Dropping obs_column.sql fixture table...
-Done.
-Dropping obs_column_table.sql fixture table...
-Done.
-Dropping obs_column_to_column.sql fixture table...
-Done.
-Dropping obs_column_tag.sql fixture table...
-Done.
-Dropping obs_tag.sql fixture table...
-Done.
-Dropping obs_85328201013baa14e8e8a4a57a01e6f6fbc5f9b1 fixture table...
-Done.
-Dropping obs_3e7cc9cfd403b912c57b42d5f9195af9ce2f3cdb fixture table...
-Done.
-Dropping obs_ab038198aaab3f3cb055758638ee4de28ad70146 fixture table...
-Done.
-Dropping obs_a92e1111ad3177676471d66bb8036e6d057f271b fixture table...
-Done.
-Dropping obs_11ee8b82c877c073438bc935a91d3dfccef875d1 fixture table...
-Done.
-Dropping obs_d34555209878e8c4b37cf0b2b3d072ff129ec470 fixture table...
-Done.
-Dropping obs_b0ef6dd68d5faddbf231fd7f02916b3d00ec43c4 fixture table...
-Done.