Fix tests and update to v1.1