corrections
Tests for gender analysis
fixed merge conflict