Unit Test Project Added to Solution

+refactoring