Verify against combined schema

This remove the assumption that verify runs against intermediary schema, and as a side-effect fix #67.