Updated test, and added a check for tuple length