Add more test methods