Update deprecated tests