A collection of upgrades and fixes

Fixed bugs with the unit-tests structure. Everything is working as
intended.
Fixed the population input for C_Bonnet2.py. Now including population
from 1996 instead of 2007.