contracts to separate project. added common test