Fix tests for master