Added spork and guard.  Test refactoring
More test refactoring