Changes way API format is set and updates unit tests