Fix tests to match the new navbar too