Issue #434 fix controller tests