- Clean up and fix the tests (Closes: #7343)