Fix breaking unit tests

Sorry Steig....