Added a lot of stuff to testing file