MM: changed junit version, changed feature and steps definitions