Initial tests, some client module updates