Fix test-requirements conflicts