Cleaning up some more tests, still messy.