Fix tests (should api)