#1718 Various enhancements to tests
#1718 Use lowercase method names