Added tests for core class
Started to refactor console app