Tests compile, but 152 still failing