Cleaned up and added randomized tests.