Prepping for cleaner schema-specific testing