Tidied test data/expectations
Better path parsing in server