test(clustering): Changes to hopefully support clustering