Tests work

Created configuration options.
Fixed base test to use the correct data.
Fixed client.

Change-Id: I16ac31f364697ba3af8cf0f544a2818530414566