VerifyNoInteractions no longer throws exception, changing tests to reflect this. Other test refactoring. -Jon