Starting to develop 2.0.0-SNAPSHOT

Minor changes expected to support Test managing functionality from
outside.