Clean up sender naming checks
Make expectation workers return pure message
Use didLog