Clean up base rule
Fix warning messages
Redo entry
Move Reporter
more tests