spark: make import robust to old versions of spark
compute: fix test due to binop naming change