Removed stale test (and some cleanup of others)