SHDP-436 Add more testing