SAMZA-412; replace assert calls in tests with appropriate JUnit assert methods
SAMZA-407: Add metric for counting exceptions by type