Quixey - tiny code cleanup, now sorts platform ids to ensure order, made test more legible
Merge branch 'pr/255'