Refactor controller support
changing tests left and right