Fixed tests and media queries #13

Merged
merged 2 commits into from Jul 21, 2014