Fix tests and pod