couple of name cleanups, new test for SOD files