Merge pull request #126 from srawlins/split-tests

Split tests