Minor test/view fixes.