Fix tests and adjust configuration