Reorganize and optimize

1 job for master in 2 minutes and 13 seconds
Status Name Job ID Coverage
  Test
passed build #4631

00:02:13