More tests

* Wand trait tests (passing)
* Ring trait tests (passing)
* Minor rings tests (failing)