Minor updates to JUnit testing. #13462