Refactoring
Refactoring to follow testing convetions in this codebase