Added two more test checks