Commit test updates that were supposed to be part of b76e26c9cf1fc805663d86b6d6d081f91f73ea18