cleanup of testpost and rejoining some leading aposts in testpre
'Bhfuil handled correctly