More testing. Part of #2028.