Extracted out input parameter matching
Corrected package paths
Corrected DWT SO/DO logic

Added tests