fixed expectation messages
sorting expectations as option and tadaaam... all tests pass!!