This commit fixes #101 (pictures will now remain linked to their corresponding album item, even under special circumstances. This fixes the failing unit test and adds two additional ones
Small adapations