make sure v2 tests only expect desktop tiles
make sure v2 tests only expect desktop tiles

Squashed commit of the following:

commit 2b33197806bac9f3a56cd8270b728ea8a93367cc
Author: Olivier Yiptong <olivier@olivieryiptong.com>
Date:   Mon Jun 29 11:04:45 2015 -0400

    make sure v2 tests only expect desktop tiles

Closes #23

oyiptong/onyx,ncloudioj/onyx,oyiptong/onyx,mozilla/onyx,mozilla/onyx,ncloudioj/onyx