Add support for even more complicated current data test