Add controller test Fix #1