Ref T17 inclusion of test stuff