Update the REST API (again :() + New Unit Tests