Added test data and started implementing tests