Mostly back on track

* Most tests back to normal.
* Still have to do specific magical armor generator