-cleanedup controller
-tested stub to be loaded by require in e2e env
-written more unit tests