updated controller
fixed testing issues
Merge pull request #88 from wlabranche/testling-fix

fixed testling issues