I think the models are in good working order.  Time to validate them and get unit tests on them.
Removed fake images from testing.