Fix tests and tab highlight