Extending unit tests, and fixing a bug.
Authored by: evrijkom@adobe.com 2009-12-03
Parent: [r591]
Child: [r593]