Cleanup writer test and check extended buckets