Minor test re-org