Move to instance methods for Color model
Simplify server tests