Add various types of tests