More work on unit testing paths