Fix tests, include alternative formats