Fixed breaking tests