Fix tests and prepare for version 0.18.0