revert circular, add multi-entry test