Refine specs for reserved words
 fix some more ruby code matching, add some tests