Add linux & windows tests compatibility