Resolve pull request comments.

Resolving these comments made me notice a number of places where there
was inconsistent use of Spring's Assert versus junit's Assert.
Standardized on junit.