Rough implementation of embedded object matchers
Massive refactoring of test utils to make tests more resilient