Testing enhancements

I use these personally, you're welcome to reject or change as you see
fit. This just makes it easier during development to run guard to have
it run all the tests.