Sorted out test errors
Ready for review
refs #13287