Rename test
Add test methods