Fixed more a few specs
Changed base controller