Categorized test methods
Fixed tag naming
Added more rules from Moose