pull request cleanup
pull request cleanup
added in unit tests