ticket:2 fix in tests for user photo; cosmetic changes