Added testing of client stuff