Greatly improve tests