Restore inheritance from Object (which was accidentally dropped).

Fix image filename/url in tests.