tweak test output alignment
fix some mock issues