Fix scala tests