s1451 - Added performance benchmark tests.
s1451 Code review changes.