#Moved the tests into name spaces, little bit of code cleaning