more fixes to test

It kinda shows that I'm lacking a real runtime here at home :)