Cleaning some tests up