- Moved current random tests to a more logical place