Added default random mode and tested