Fixed first 2 tests.