Simplify patch
Simplify install path
Use an explicit path for test