Added regex named class token and new tests. Fixed a couple bugs.