Expanding on tests and better validation
Cleaning up namespace