Fixed testing data and deleted unnecessary pieces