More updates to the tests from my recent code updates.