diff --git a/beacon_node/rpc/src/validator.rs b/beacon_node/rpc/src/validator.rs
index c2e10885dc..936c95f52f 100644
--- a/beacon_node/rpc/src/validator.rs
+++ b/beacon_node/rpc/src/validator.rs
@@ -72,7 +72,6 @@ impl ValidatorService for ValidatorServiceInstance {
         };
 
         // get the duties for each validator
-        dbg!(validators.get_public_keys());
         for validator_pk in validators.get_public_keys() {
             let mut active_validator = ActiveValidator::new();
 
@@ -89,7 +88,6 @@ impl ValidatorService for ValidatorServiceInstance {
                     return ctx.spawn(f);
                 }
             };
-            info!(self.log,""; "Public key" => format!("{:?}",public_key));
 
             // get the validator index
             let val_index = match state.get_validator_index(&public_key) {
@@ -102,7 +100,7 @@ impl ValidatorService for ValidatorServiceInstance {
                     );
                     active_validator.set_none(false);
                     resp_validators.push(active_validator);
-                    break;
+                    continue;
                 }
                 // the cache is not built, throw an error
                 Err(e) => {
@@ -128,7 +126,7 @@ impl ValidatorService for ValidatorServiceInstance {
                     );
                     active_validator.set_none(false);
                     resp_validators.push(active_validator);
-                    break;
+                    continue;
                 }
                 // the cache is not built, throw an error
                 Err(e) => {
diff --git a/eth2/types/src/test_utils/testing_beacon_state_builder.rs b/eth2/types/src/test_utils/testing_beacon_state_builder.rs
index 79977c277d..b38e8b5273 100644
--- a/eth2/types/src/test_utils/testing_beacon_state_builder.rs
+++ b/eth2/types/src/test_utils/testing_beacon_state_builder.rs
@@ -120,7 +120,7 @@ impl TestingBeaconStateBuilder {
             })
             .collect();
 
-        let genesis_time = 1553740824; // arbitrary
+        let genesis_time = 1553753928; // arbitrary
 
         let mut state = BeaconState::genesis(
             genesis_time,
diff --git a/validator_client/src/duties/grpc.rs b/validator_client/src/duties/grpc.rs
index a3ec6f52b1..511ffa34a2 100644
--- a/validator_client/src/duties/grpc.rs
+++ b/validator_client/src/duties/grpc.rs
@@ -36,7 +36,7 @@ impl BeaconNode for ValidatorServiceClient {
             if !validator_duty.has_duty() {
                 // validator is inactive
                 epoch_duties.insert(pubkeys[index].clone(), None);
-                break;
+                continue;
             }
             // active validator
             let active_duty = validator_duty.get_duty();