Separated tests
Removed useless local variable