Fixed up way controller tests for API 0.6.