Cleanup of grunt. Cleanup of test file. Improved AST/accuracy.