added more test data
made minor changes