Refactor - remove dependency on Build Test Data plugin since not really
needed