Updates to regression suite

Updates needed to regression suite found during 4.0.1 release testing.