Fix spec definition to properly check for variant id.
Test latest 2.1.5

Conflicts:
	.travis.yml

Conflicts:
	.travis.yml

Conflicts:
	.travis.yml

Conflicts:
	circle.yml