First working version
Seeting coveraging to 100%