Port: more util test classes