Issue #197: more test adjustments now that only one spec kept per registration