Get the tests fixed.
merge :)