Progress on tests - for relase of Hermes 2.0.