cleanup app state before a test too (rewrite of #1732)
cc @dandoveralba @bootstraponline
Merge pull request #1726 from jlipps/master

cleanup app state before a test too (rewrite of #1732)