removing the ostruct as I moved to Test objects