Merge "EntropyMixerTest: convert to JUnit4"