Fixing miscellaneous issues with finalcall and stile tests