Upgrade/compound

Switched to compound
DRYed the tests