Updated unit tests for bug#7369.