WIP: Fixing tests after modifying REST API.