Tweak the data building setup
Tweak testing setup to run only 10K subtyping tests