fixed up tests a bit