Failing tests have been fixed