Code cleanup after merging branches for css chrome tests