Created a more varied range of function tests