Fixed all tests!  Still need to add more
Minor code formatting
Added a test for OrderedHashDict