Extended test cases; python3 support