make tests pass again, tidy simplecov integ