More tests resolved