fixes for unit tests