Added more test coverage. There is also CodedUI tests in place and coverage for those areas affected

Added more tests and upped the coverage.

Ran the coded ui tests around the area where the code was removed from. Found and resolved a bug that was picked up on the coded ui when trying to run the Rull All Tests and then opening the Tests view. All coded ui tests around this area are passing.