improvements in TestCore
resolved-related fixes + tests