Modify test and interface