Changed root path and fixed tests