Added more unit tests and added more sample data.