put expected on the left in the tests
merged with current master