added files to test data
extracted main class, added few unit tests