Simplify more and fix testBuildSchema to reflect changes