Update tests (previous merge from master wasn't performed correctly)