Update test
Remove useless code
Rename test class