Made some changes on the test methods.