Add additional tests for all new scenarios

[Steve Gordon]

Some tests were added or updated while merging new features, some were skipped and these should be added to prove the logic and to get everything ready for a release.