Test file path fixes, cleanup, optimization