Bug 7639: (follow-up) add Unit Tests