Separating out the tests
Changed the copy a bit