sorted test fixtures
Merge branch 'master' into 3_0

Conflicts:
	Tests/fixtures/smartphone.yml
	Tests/fixtures/tablet.yml