Cleanup skins/SiteBarTest and @todo/covers

Change-Id: I501d04ddbeee23539337b68142ee6c1371a63d98