Fix typo when doing mark-test-ok.
Handle static class declarations.
Also checkin missing test files.