Added a few more test