improve to tests before refactoring
fix break tests