fix if/unless brain fart and adapt tests for theme and indicator
move require('zombie') inside functions to make tests run faster