Merge "Fixed several core and CTS tests"