Bug fixes in deal tests