Added additonal color spaces and tests