Adding some tests back that I accidently deleted ooops.