Touched up the testing more