Fix failing tests
Merge pull request #49 from JoshFB/popup_jfb

Fix failing tests