Removed hyphen from rule names
Added more tests, reorg into subtests
Updated Changes and Makefile.PL