Added more tests, about to move on to wildfire and wrapping for watchfire, fixed a bug in watchfire that added effects to the wrong places