fix unit tests (#554)