Merge pull request #114 from romankonz/master

simplified unit testing
removed files for old test setup