Added last tests and now 95% percent of our code is covered