Refactoring, removed unit test

Refs #10092