FIX broken unit tests