reorganize client test files