fixed more spec tests, broke others. yay.