Tests and some cleanup for photos app.