extended and more or less fixed tests, refs #8486