Config tets + bugfix