Merge pull request #511 from TheBlueMatt/2020-02-test-pub-in-test-only