For now, remove tests