Fix REST services for test functionality