More tests

Refactored the site map tests
Added a cli dispatcher