Fix test suite for latest Aspen