(Moved around AST test)
(Minor build.xml cleanup)