Fix test and add one more test