minor unit tests fixes