fixed failing astbuilder test cases