Cleanup and test fixing
Added direct agreement contracts
Added contract type to output