WIP: Fixes util specs.
WIP: Updates specs for new path handling features.