Removed all coverage stuff because of big timeout

* This improvement will need more time and study