Merge changes I7d112dda,I4374faac,I3b773d07,I421b5495

* changes:
  Adds test to collect performance metrics
  Add Main back to run in buildbot
  Refactor tests structure
  Update Config.getTime method after the N release