changes to get unittests to work