Fixed some more logic errors

2 jobs for master in 5 minutes and 20 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #1673
build

00:03:00

 
  Test
passed #1674
unitTests

00:02:20