Fixed all tests to pass