Fix tests to work with recent Bumbleworks