I think we should increase these to 5000 just in case; it won't add to the run time but will avoid any problems due to short glitches on the CI server. We should also check for null to avoid NPE in tests. Will make both changes during merge.