Simplify test schemas