#18 stricter tests