Main contorller tests corrected.