Commit before retackling controller tests