Updated to use os independent paths in unit tests