Fixed the tests
Updated version