cleanup + increase of timeout for code coverage