cleaned up test portion