Removed old REST-like solution and fixed tests.