Inline agg - hash aggregate

Try to be consistent about using assertNotNull(X) instead of assertTrue(X != null).