New tests, switch parsing to XML to track queries, fix setup.