added some ast tests; fixed breakages