Fixes to tests, made it possible to wait for JSIS run to complete