Moved to REST, tests