Fixed imports
Moved signals
Moved tests