Expand those tests