Fix tests for 0.5