Add basic Picture unit tests and fix some revealed inconsistencies