Adding in some tests
Working on internal data format