More test coverage

* Finishes color tests
* Expands device coverage