Bad terminlogy and tests style corrected