Merge changes I85926323,Ia4ab69c8 into main

* changes:
  Move Time servicestests to their own test module
  Move Time coretests to their own test module