Switched to numpy version of random, included plotting checks