this is now fully tested on a small set of toys and worls as expected. A large scale test is still outstanding.