ENG-15 remove old code from test data