Included new test methods