Unit Test Classes: Bugzilla_336590