Update remaining tests and fix path issues.