Had to "fix" the tests