Some tests updates

Some tests updates