cleaned up colorspace and added more tests