Split up tests

Create sample photos in seperate test, and cleanup in yet another new
test file.