fixes in dev code for tests