Reverting tests to using array not typed data object