Converted more test and fixed pathCheck