Flush out pin tests some more