make more tests less ordr dependent