Split client tests and cleaned up user