Refactored into own package; Added BasicContractsTest for common methods