Used new controller testing framework 

Should hope fully make testing easier