Bug fix on testing remediation and code updated. STORM-129.