Fix some failing tests

Sorry about that