get rid of this.x, no longer needed
refactored services.js
added new tests
added new test (and fixed typo)