adding null checks
always run before and after methods
Merge pull request #226 from raghavgautam/always-setup

Always run setup and teardown methods