Re-organized undone integration tests for controllers