Fixed and got all tests to pass