Fix renames
More renames
Cut out the sys.path related tests for now