simplifcations and fixes

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

00:00:27

passed #13878
deploy

00:01:10

passed #13877
test

00:00:29