Fix breaking unit tests