Reorganising to separate interpreter code from test code.