diff --git a/api/api_test.go b/api/api_test.go
index 2ce8c53..f8ae002 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -374,11 +374,21 @@ func TestMain(m *testing.M) {
 		OpenAuctionSlots:   uint16(5),
 	}
 
+	var buckets [common.RollupConstNumBuckets]common.BucketParams
+	for i := range buckets {
+		buckets[i].CeilUSD = big.NewInt(int64(i) * 10)
+		buckets[i].Withdrawals = big.NewInt(int64(i) * 100)
+		buckets[i].BlockWithdrawalRate = big.NewInt(int64(i) * 1000)
+		buckets[i].MaxWithdrawals = big.NewInt(int64(i) * 10000)
+	}
+
 	rollupVars := common.RollupVariables{
 		EthBlockNum:           int64(3),
 		FeeAddToken:           big.NewInt(100),
 		ForgeL1L2BatchTimeout: int64(44),
 		WithdrawalDelay:       uint64(3000),
+		Buckets:               buckets,
+		SafeMode:              false,
 	}
 
 	wdelayerVars := common.WDelayerVariables{
diff --git a/api/state_test.go b/api/state_test.go
index 88370aa..267ffdf 100644
--- a/api/state_test.go
+++ b/api/state_test.go
@@ -82,7 +82,7 @@ func TestNextForgers(t *testing.T) {
 func TestUpdateNetworkInfo(t *testing.T) {
 	status := &Network{}
 	assert.Equal(t, status.LastSyncBlock, api.status.Network.LastSyncBlock)
-	assert.Equal(t, status.LastBatch.BatchNum, api.status.Network.LastBatch.BatchNum)
+	assert.Equal(t, status.LastBatch, api.status.Network.LastBatch)
 	assert.Equal(t, status.CurrentSlot, api.status.Network.CurrentSlot)
 	assert.Equal(t, status.NextForgers, api.status.Network.NextForgers)
 	lastBlock := tc.blocks[3]
diff --git a/api/swagger.yml b/api/swagger.yml
index 75e9bd9..4a1d744 100644
--- a/api/swagger.yml
+++ b/api/swagger.yml
@@ -2791,10 +2791,6 @@ components:
                 type: integer
                 description: Max USD value
                 example: 1000
-              blockStamp:
-                type: integer
-                description: Last time a withdrawal was added ( or removed if the bucket was full)
-                example: 4475934
               withdrawals:
                 type: integer
                 description: Available withdrawals of the bucket
@@ -2810,7 +2806,6 @@ components:
             additionalProperties: false
             required: 
               - ceilUSD
-              - blockStamp
               - withdrawals
               - blockWithdrawalRate
               - maxWithdrawals