Cleaned up a bunch of expired tests