mix fixes for pytest support