More progress towards working tests.