Added a little more to the complex test
Fixed more path reconstruction errors