fix test (after pulling from upstream develop)