Fixed up the testing