Add no coverage option an add some includes