Fixed tests with elastic