Fixes to t6
t7 done
t8 start