Some refactoring of tests
More refactoring
Add ignite spell
Move some test code so they run faster