Remove tests which were using the Photo model.
Additional fixes.
Fix up some tests.