Updated path values, moved test code to test folder