Fixed most specs, forgot how much of a pain nested attr are"