Added black/white functionality. Tests pass ok