Move tests around, enable coverage