cleaned up some unnecessary features, cleaned up test