Clean up tests [WIP]

refs #4639