More tests for internal store, handle case of non-matched bucket