Still trying to fix the unit tests