whitespace
fixes test project
updates test to current config api
uses enums instead of int literals for code matching
addresses two style errors