Simplify colorSet method, fix tests
Final router spec