fix broken tests and prepare for next release