Refactoring
Refcatoring, movie code out from test to classes