Fixed first test, working on 2nd