Started adapting tests.