Merge pull request #300 from TheBlueMatt/2019-01-tests-split