Changes made based on feedback. Moved to south_africa, filter fix, tests added.