Fixing the imports, renaming some the test strings due to pathing changes.