More changes
Moved tests