Major merge of new tests

(Description of new tests)