Hyperion: fix order-dependent tests