Events controller, updated specs