Added negative client tests; updated controls