Replace instance variables with locals to fix CLI.

* Updates tests to check for conditionals on page.