Fixing the matching logic in assert_styles.
Fixing tests which where discovered to be broken.