Eliminate repetition (solves exercise 3.1)
last commit
chaged some tests