Cleaning
Cleaning
Moved tests to separate file