Cleaned up already there test