Add unit tests for Doug Goldstein(ddg625) and Shan Gupta (srg538) [Update]