cleanup
Add test
Refactor, reduce duplication.
Merge branch 'master' of https://github.com/eranpeer/FakeIt