* test fix attempt * test fix attempt 2 * test fix attempt 3 * test fix attempt 4 * test fix attempt 4 * cleanup * fix for client test * fix attempt 5 Co-authored-by: Agnieszka Gancarczyk <agancarc@redhat.com>