Merge two tests - make more sense