+coverage, refactor setup