Update for new VarTree syntax

Also removed files generated during tests