adjust changes required by moving unit tests into test/framework