Rewrote tests with new refactored code
Removed demo, put all classes in one package and renamed them