More test clean ups and expressive assertions using Hamcrest