Got the tests working again.