T10 Fixes to tests