#17 fix gid/pid
tests cleanup