Merge pull request #747 from bhariharan/unstable

Latest shared repo commit
Removed "gold file" tests, replaced with other logic
Merge pull request #748 from khawkins/remove_gold_file_tests

Removed "gold file" tests, replaced with other logic
Removing unused imports and method