Fixed the failing tests that I know about