Finish effects for monster spells
Tidy up effect parsing
Partially fix tests