Working on test refactoring