Adapt tests for new plumber