renamed test methods and added several new ones