Refactorings
Set up unit testing