fix config and update tests