Fixed #2 tests passed