Added missing files from commit and proper random and test code.