get tests passing again after package reorganization