refactoring, changing unittestss