Pull Request comments addressed. Tests fixed.