Added test data

Added test data,
Fixed few minor bugs