slightly better test discipline