Use consistent schema manipulation technique in tests