Added more test data (red)
Fixed small bugs