minor changes (static value for orange was wrong) some more tests