Forge Tests improvements & fixies