started adapting tests