Removed parameters in unit tests
Moved to better named packages
Created function for common executions