Unit Test Classes: Bugzilla_337587