Unit Test Classes: Bugzilla_516824