added E1 - D.R.Y. - class and test