multiplatform unit tests fixed