Added object view to tool and to test.