Fix mix tests

Another fix for #1585