added new tests and scenario tools
merge