Tidy up code
Fix test for exsting install path