Add guard and get rid of duplicate tests
Install Spork