Fixes for setup method to be run by parent class
Merge pull request #1 from nateben/latest_master

Fixes for setup method to be run by parent class