Adding more test to make more robust the testing