Fixed first set of tests