When you did the Fuel pump fountain test, did you have the injectors or glow plugs out of it?
Doing it with compression (slowing spinning) will lead to small fountains.
You would know if the injection pump is not putting out enough fuel as it will not reach a good top end RPM, it will stumble...