changed color testing to conform to Grid