Add tests for the DS9 upgrades.
Fix implementation of Quark

Fixes #98