Big section refactor
Fixing paths for tests