Added basic skeleton for proper testing.
Rebased onto master.
Fixed failing tests after merge between pierce and my code.