Fixed first couple of tests