Add data getter and fix test to use them