changed back the testing parts