more defn tests; flatten blocks in the parser