Modify and add new test