More tests and stylecop cleanup