Addressed review concerns:

- Using documented unit test
- De-Voldemortification
- Removed bool check
- Fixed import order
- Duplicate element unit test