fix bucket accessor and tests