Fixed up test class, removed some commented out code