Avoiding hardcoded version
Fixing tests