more accurate use of resolved,fulfilled etc.; remove redundant tests, add new ones