Minor updates for testing and minor updates to item and bucket termination