EX-64 (kmeng) changes made to strelka module and its test.
Revert "EX-64 (kmeng) changes made to strelka module and its test."

This reverts commit abd2f2c3ac208d27726d19f2d3ae9548c580bc70.
Revert "Revert "EX-64 (kmeng) changes made to strelka module and its test.""

This reverts commit 706a9ef8e719ac4face6145a4be46459d1a88ca3.
EX-64 (cgates/kmeng): Strelka tests and merge from branch
EX-64 (cgates kmeng) Finishing up refactors