Bug 1020580 Unit Test Implementation