Minor Fixups and add tests

See merge request !447
3 jobs for master in 0 seconds (queued for 1 second)
Status Job ID Name Coverage
  External
failed SlapOS-Master.UnitTest-Master

01:45:02

failed SlapOS.Eggs.UnitTest-Master.Python2

00:12:39

failed SlapOS.Eggs.UnitTest-Master.Python3

00:13:57