Updated unit tests for Bug 295.