Make tests and coverage working