Upgrade simplecov and tidy up config