fixes unit test failures. Few introduced by acqusition code.