Fixed the tests by adding another option for the advanced property pass.

Long-term, I'd like to see both passes merged...