Fixed a bunch of specs that handled propers and cutoffs