[V2S3 US60403898] Changed some unit tests