Better amd testing, More tests, marionette exploration