Removing the Unit tests and replacing with spec tests.. which will help with the refactoring.
Don't bother outputting name space when it's not needed.