GH #298 - Split tests into separate test cases.