Removed useless function
Improved test suite