Commiting refactored code and unit tests