Testing and QA

More new feature tests in the 3.6 QA cycle