cleans up the expectation side of things, fix #24 fix #12