Start adding some tests
Update Gedmo trait
Simplification