BAD-35: Moved test packages to match code-under-test packages
Merge pull request #98 from mattyb149/bad-35

BAD-35: Moved test packages to match code-under-test packages