Tests rewritten for classic approach.