Mark some more tests as slow and do some cleanup while there.