Some refactoring to make numbers into Integer, rather than String.

Added parse tests for all photo samples.