Rewrote some of the testing file