simplifcations and fixes

3 jobs for master in 2 minutes and 7 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed build #13876

00:00:27

passed deploy #13878

00:01:10

passed test #13877

00:00:29