fix unit tests according to #303