Work on getting unit_tests to function
unittests functioning with new
architecture
Merge branch 'master' into dev

checking compatibility