Removing breaking tests