Added some more test cases; fix potential problem with find_good_color loop