LDAP-258: Some minor restructuring to avoid (irrelevant, but ugly and build failing) package tangles in test cases.