Refactor event and user specs