Fix tests, prepare for release