Version 2 - cleaned up test methods