Tests fixed
Mono solution updated