Merge "Update tests due to new platform API intruducing ambibuity"