Bringing in old jazzcat tests. 4/6 pass for now.