Run faster tests first, fix comparison in test_advanced