Modified controllerSpec and moved test to End2End Scenario