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