shapiro test for amptester, and some tweaks