Fix and move the events controller test