Fixed tests
Updated version