Fix failing unit test #11

Merged
merged 3 commits into from Nov 14, 2012