Combined some tests and cleaned up old files.