quote siteconf path in case of space and update relevant tests
simplify logic