Simplified controller and created e2e tests