Further modified import statements. All tests in unit_tests now appear to pass. For Ticket#109.