Completed and fixed several acceptance and controller tests.