Fix minor typos
Add controller tests