re-added unit tests lost during Eclipse Aether merge