Remove on :message test and fix rand_three