Fixed controller alias, and switched test convention folder to tests