Fixing ClientSystem tests.
Additional testing.