reorganized test utils