Added Controller tests