Adding underscore test methods to test suite
wip - wgaon improved