[new] Test for both