Make test work - this time, for sure!