Tests, tweaks and unified simplecov