Modify pathname to better enable testing
Add integeration testing