End to end testing complete, final tweaks