Completed the overhaul of tests to make them more portable. All now passing.