refactor, some tests - need to remove logs