Full test coverage. Added gender support.