Update remaining tests and fix path issues.
Add early return to save some tabs.