Continued to update unit tests
Resharped classes