Fix breaking of tests