Switched to "modular" test design.