Added more complete chain test (via logs only), plus some renaming