NUnit and unit tests created
Tests and Refactoring