Tests, tweaks + coverage reporting