Got rid of deprecation warnings in tests; added simplecov