More test cases, fxCop cleanup.