Update tests
Added support for namespace serialization.
code cleaning