Solve problem 1
Janitoring
Small fix
new solutions
adding tests