Update imports and paths

Update for the new tests directory structure