cleaned up a couple of tests