Remove stray module
Make RSpec matcher for commands corresponding to events and generic messages