Fix tests and resolve offers