Fixed some tests real quick