Cleaned up old tests