Added some data and tests