Removing a couple of hardcoded paths
Bit of cleanup (remove hardcoded paths in test). Documentation.