Finished! All base expectations complete with passing rspec and rake tests. Minor changes to the random methods to keep false positives from popping up. 95% code coverage.