Pulled in new tests and fixed them