Remove usless test
Improve naming