Removed more test generators and implemented a weighted generator for gender.