adopted unit tests, refactored media queries ordering