Refactoring for running tests
Refactoring and getting ready for comparisons
More cleaning
Testing script