Adding expectations to regroup expect unit tests.
Separate namespaces in file (not the standard way as I do not know the
convention yet)