More progression with the controller test suite. TRAD-34