Fix tests and make them all green!