Fixing the last failing tests