More terr-ast test coverage