Updating based on PR review and adding tests