Merge changes Ic537ab0d,I63745307 into main

* changes:
  Add TEST_MAPPING for time related coretests
  Run more CI tests when changing API classes