Adds Calculator REST services test, refactoring