reverted MessageType order as it was before commit f4c962c338
removing TODOs from specs, problem solved