Refactor some tests to make it all green.