Fix typos and refactor some controller specs