tweak test util methods, add a few comments
add renamed file missing from prev commit