Fix Tests due to lowercase changes