Pulled in more tests