test threads shortened
Revert "test threads shortened"

This reverts commit 457827ad6c5e22cefae9b57b12d1783f37181090.
Test  threads shortened
flat thread positioning now correct
upper_flat calculation wrong