Added additional Unit Tests, addressed review comments.