Fix and update Spork and Guard to run test suite successfully