Resolve test conflicts over global vars