integration test, refactoring, readme