Down to 3 specs failing, probably all test issues