Fixing up relative paths for Claire's unit tests.
Merging with Claires lastest work.