added all tests for Contract..everything's green