Change test infrastructure. Work in progress.