Test cleanup

These are changes I've made to keep both Sprinkler and Blaze happy.