Removed old tests, uploading working controllers