Fixed test project reference in solution file.
Reformatted all modified code using updated R# code style settings.