Made some changes to the testing code.