Re-organize controller tests and address some FIXMEs.