fixes for latest pytest