Fixed tests, yay