Added state merge-testing to singletons/crowbar/crowbar/1684
Made state merge-testing a child of new in singletons/crowbar/crowbar/1684