More updates to tests

This branch/PR is meant to add and improve several tests before 1.3 is out.