Refactored wv.util test cases