Modified some tests to help discussion.