Update colors on demo
Fix test cases