Added headless support for testing
Merge remote-tracking branch 'origin/check-item-count' into adding-headless

Conflicts:
	Gemfile.lock