continue to remove abuse of return types in test lookups