fixes tests, by adding opts handling to mock-server