changed tests per comments on pull request