test refactoring
Created new tests