generic-spec tests & updates to supporting code / grammar