refs #4564 added some more test cases and removed some obsolete comments
refs #4564 whitespace