Added Controller testing