Added ability to remove friendlyPath attr, cleaned up tests