fixed tests per comments on last pull request