RESTWS-333: Fix ObsControllerTest
RESTWS-333: Follow up fixes