Added ContractImpl annotation.
Cleaned up ContractSuite