Expanded AST test. Removed obsolete methods.