Fix tests for 8.1 SDK