cross platform tests fixed