Fix state sync.
Organize test files.
Client
Merge remote-tracking branch 'origin/master'