Fix the unit tests
Fix the rest