Initial changes in response to code review
Updates to tests in response to code review