updated test config and generale fixes