New schema means a quick and dirty way to make tests pass