Public controller test fixes #62