Backed out last push, cleaned up test by removing randrange.