changes to expected
Merge branch 'master' of https://github.com/sundaymtn/waterline