Fixed and passed all tests