Fixed some test foolery