Included 10 new test methods