Get tests up to date#20

kstppd wants to merge 4 commits intofmihpc:masterfmihpc/fsgrid:masterfrom

kstppd:masterkstppd/fsgrid:masterCopy head branch name to clipboard