Fixed up tests and everything looks good