Removed some versions into variables

Tests have been slightly enhanced