minor refactor over test