Fix tests

 - make if/else simpler/obvious
 - colors
 - silence
 - little cleanup