Addressed comments and added additional unit tests