Tuning of highlight and background modifiers
Modified tests for #304