update tests so that different orderings doesnt mess things up.