Attempt to fix github-related tests