remove duplicated test, improve context