Make a few tests more generic to work on other forks