All tests now pass for better or for worse