added additional unit tests
fixing merge conflicts