Ongoing additional tests

Ongoing additional tests