fixed up tests a little