Some clean up.

Packages readjusting. 

We have cycle in the domain ...
Moved some test